Add upstreamed patch to fix FTBFS with cloudprint enabled

diff --git a/debian/patches/cloudprint-Fix-redundant-declarations.patch b/debian/patches/cloudprint-Fix-redundant-declarations.patch
new file mode 100644 (file)
index 0000000..0bc059b
--- /dev/null
+++ b/debian/patches/cloudprint-Fix-redundant-declarations.patch
@@ -0,0 +1,26 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Sat, 8 Aug 2020 14:19:14 +0100
+Subject: cloudprint: Fix redundant declarations
+
+This is the equivalent of 72c72d0b, but for the cloudprint backend.
+
+Signed-off-by: Simon McVittie <smcv@debian.org>
+Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/2414
+Applied-upstream: 3.99.1
+---
+ modules/printbackends/gtkprintbackendcloudprint.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/modules/printbackends/gtkprintbackendcloudprint.c b/modules/printbackends/gtkprintbackendcloudprint.c
+index f99bcca..f347fc4 100644
+--- a/modules/printbackends/gtkprintbackendcloudprint.c
++++ b/modules/printbackends/gtkprintbackendcloudprint.c
+@@ -71,8 +71,6 @@ struct
+ } typedef TGOAAccount;
+ 
+ static GObjectClass *backend_parent_class;
+-static void                 gtk_print_backend_cloudprint_class_init      (GtkPrintBackendCloudprintClass *class);
+-static void                 gtk_print_backend_cloudprint_init            (GtkPrintBackendCloudprint      *impl);
+ static void                 gtk_print_backend_cloudprint_finalize      (GObject *object);
+ static void                 cloudprint_printer_get_settings_from_options (GtkPrinter           *printer,
+                                                                         GtkPrinterOptionSet  *options,

diff --git a/debian/patches/series b/debian/patches/series
index ac0a39e1988d42a26db93e59237f7e0cdbbfba42..fc33be15a1269175a90d57a5a0bef8d338b4edb3 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 testsuite-Fix-installed-tests.patch
 installed-tests-Fix-the-icontheme-test.patch
 cups-Don-t-emit-a-warning-if-we-can-t-talk-to-avahi.patch
+cloudprint-Fix-redundant-declarations.patch
 roaring.-ch-Add-attribution-and-licensing-information.patch
 Include-a-copy-of-the-Apache-license.patch